Fix up the focus-chain tests

Several typos here, and some of the expected
output changes due to widget class changes.

diff --git a/testsuite/gtk/focus-chain/widget-factory.tab b/testsuite/gtk/focus-chain/widget-factory.tab
index 75fa0c4f2b633ffb3c44425237ce31c62784bc47..468e4560fddd5a237694fc3920a85d945c3d337f 100644 (file)
--- a/testsuite/gtk/focus-chain/widget-factory.tab
+++ b/testsuite/gtk/focus-chain/widget-factory.tab
@@ -11,8 +11,6 @@ GtkCheckButton
 GtkCheckButton
 GtkCheckButton
 GtkCheckButton
-GtkCheckButton
-GtkCheckButton
 GtkToggleButton
 GtkToggleButton
 GtkToggleButton

diff --git a/testsuite/gtk/focus-chain/widget-factory.tab-backward b/testsuite/gtk/focus-chain/widget-factory.tab-backward
index c6d9b10e241a3395db0b13e99196edca6b0782be..dd7582889a7883f2ab56611a80648a0feaf6d087 100644 (file)
--- a/testsuite/gtk/focus-chain/widget-factory.tab-backward
+++ b/testsuite/gtk/focus-chain/widget-factory.tab-backward
@@ -20,8 +20,6 @@ GtkCheckButton
 GtkCheckButton
 GtkCheckButton
 GtkCheckButton
-GtkCheckButton
-GtkCheckButton
 GtkSpinButton GtkText
 GtkToggleButton
 GtkToggleButton

diff --git a/testsuite/gtk/focus-chain/widget-factory.ui b/testsuite/gtk/focus-chain/widget-factory.ui
index afdc95ec9d5c79efcc4bd9a91e97d696678ab294..c090dbf22879b537822593e93ba258a5c5fb191c 100644 (file)
--- a/testsuite/gtk/focus-chain/widget-factory.ui
+++ b/testsuite/gtk/focus-chain/widget-factory.ui
@@ -2235,13 +2235,13 @@ microphone-sensitivity-medium-symbolic</property>
                                       <class name="linked"/>
                                     </style>
                                     <child>
-                                      <object class="GtkCheckButton" id="grid_button">
+                                      <object class="GtkToggleButton" id="grid_button">
                                         <property name="active">1</property>
                                         <property name="icon-name">view-grid-symbolic</property>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="list_button">
+                                      <object class="GtkToggleButton" id="list_button">
                                         <property name="active">1</property>
                                         <property name="group">grid_button</property>
                                         <property name="icon-name">view-list-symbolic</property>

diff --git a/testsuite/gtk/focus-chain/widget-factory2.ui b/testsuite/gtk/focus-chain/widget-factory2.ui
index 9f267283cf14bdb571b093f45ede0196badc1fe1..cfc151da114ad4b946cbe60b7eb00cf46297c5e7 100644 (file)
--- a/testsuite/gtk/focus-chain/widget-factory2.ui
+++ b/testsuite/gtk/focus-chain/widget-factory2.ui
@@ -2236,13 +2236,13 @@ microphone-sensitivity-medium-symbolic</property>
                                       <class name="linked"/>
                                     </style>
                                     <child>
-                                      <object class="GtkCheckButton" id="grid_button">
+                                      <object class="GtkToggleButton" id="grid_button">
                                         <property name="active">1</property>
                                         <property name="icon-name">view-grid-symbolic</property>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="list_button">
+                                      <object class="GtkToggleButton" id="list_button">
                                         <property name="active">1</property>
                                         <property name="group">grid_button</property>
                                         <property name="icon-name">view-list-symbolic</property>

diff --git a/testsuite/gtk/focus-chain/widget-factory3.tab b/testsuite/gtk/focus-chain/widget-factory3.tab
index 2e8e5755c4252eb4a5f35e5a6daade3a8c92755d..19c6ffc74114dbda13277825832b302763abd320 100644 (file)
--- a/testsuite/gtk/focus-chain/widget-factory3.tab
+++ b/testsuite/gtk/focus-chain/widget-factory3.tab
@@ -3,8 +3,8 @@ GtkLabel
 GtkScrolledWindow
 GtkToggleButton
 GtkToggleButton
-GtkCheckButton
-GtkCheckButton
+GtkToggleButton
+GtkToggleButton
 GtkButton
 GtkToggleButton
 GtkListBoxRow

diff --git a/testsuite/gtk/focus-chain/widget-factory3.tab-backward b/testsuite/gtk/focus-chain/widget-factory3.tab-backward
index 343000efe7d9608348524a2d21648101d21d69ca..96fc15c21987ee12157a9d6ebc5aa64d7006f1b3 100644 (file)
--- a/testsuite/gtk/focus-chain/widget-factory3.tab-backward
+++ b/testsuite/gtk/focus-chain/widget-factory3.tab-backward
@@ -20,8 +20,8 @@ GtkEntry GtkText
 GtkListBoxRow
 GtkToggleButton
 GtkButton
-GtkCheckButton
-GtkCheckButton
+GtkToggleButton
+GtkToggleButton
 GtkToggleButton
 GtkToggleButton
 GtkScrolledWindow

diff --git a/testsuite/gtk/focus-chain/widget-factory3.ui b/testsuite/gtk/focus-chain/widget-factory3.ui
index ab50aed216995e8772123b0b25460d3a65534cbe..9f454b90c22b572673a323fc19c43a522ea71f20 100644 (file)
--- a/testsuite/gtk/focus-chain/widget-factory3.ui
+++ b/testsuite/gtk/focus-chain/widget-factory3.ui
@@ -2236,16 +2236,14 @@ microphone-sensitivity-medium-symbolic</property>
                                       <class name="linked"/>
                                     </style>
                                     <child>
-                                      <object class="GtkCheckButton" id="grid_button">
-                                        <property name="draw-indicator">0</property>
+                                      <object class="GtkToggleButton" id="grid_button">
                                         <property name="active">1</property>
                                         <property name="icon-name">view-grid-symbolic</property>
                                       </object>
                                     </child>
                                     <child>
-                                      <object class="GtkCheckButton" id="list_button">
+                                      <object class="GtkToggleButton" id="list_button">
                                         <property name="active">1</property>
-                                        <property name="draw-indicator">0</property>
                                         <property name="group">grid_button</property>
                                         <property name="icon-name">view-list-symbolic</property>
                                       </object>